*** empty log message ***

diff --git a/src/ChangeLog b/src/ChangeLog
index 0e09ab33c6f4502990e877fa51b6bf51694d49f2..d3b2ed805d96810856e678fb3441c4b4f2190e79 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+<<<<<<< ChangeLog
+2009-07-17  Kenichi Handa  <handa@m17n.org>
+
+       * casetab.c (shuffle): Fix the logic of setting up the cycle.
+
 2009-07-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * nsfns.m (Fns_set_alpha): Remove function.